File organization
JAR file and resource fixes