Restructure code and folders