reorganize files and use alias paths