added 2nd prototype

also chaged dir structure. not sure how thats gonna work out
various updates