Fixed problem with file extensions, added dependencies, etc