Re-ordering files more appropriately in order to split up CSS / JS