Big modification on the file structure, work on adjusting handlers with databases