Restructured folders and updated build process