Rework the entire project structure
Check width and height