The static form is hard to maintain so I am removing it + rename some components for clarity + moved some utils files
