Changed directory structure for easier usage as a library