More restructuring and tests. Deleted jQuery