Incorperate CSS, restructure directory