Separated files and fixed bugs