Separated files and removed useless ones