Changed project structure, relates to #43