renaming files in the form subpackage; lowercasing
fixing imports