fixed timeframe check
restructured project
minor fixes and improvements