restructure of project and implemented parser methods