Changed packages and added file handler
Updated some things