Basic restructure of essential files