moved source files in src subdirectory to avoid a conflict between the Propellor directory and the propellor executable
changes to work under osx