change file structure
fix command parser