Updated Imports and File Registry

Updated imports and file names. Changed file formatting and type from
prepared JAR type or eclipse archive.