Preparations for new architecture
New files
New architechture