Restructured some CSS and Javascript files