Improved file structure, added jQuery