Cleanup up file structure, added IE7 conditional comment