Restructure of the original project