Changed setup file and added manifest files to make it easier to manage code. PHPStorm setting still to do.