Added demarginizeright method and updated project structure